From e581c148d9b304886387953d7ab7114711109cc7 Mon Sep 17 00:00:00 2001 From: Benjamin Otte Date: Fri, 8 Oct 2021 18:38:51 +0200 Subject: [PATCH] testsuite: Add run for GLES This is supposed to test the most fallback GL stuff, so we might want to set even more env vars here. Also enable the run for the Fedora builder in CI. --- .gitlab-ci.yml | 1 + .gitlab-ci/run-tests.sh | 24 ++++++++++++++++++++++++ testsuite/meson.build | 12 ++++++++++++ 3 files changed, 37 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 70949b9e18..212c857643 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -91,6 +91,7 @@ fedora-x86_64: - meson compile -C _build_hello - .gitlab-ci/run-tests.sh _build x11 - .gitlab-ci/run-tests.sh _build wayland + - .gitlab-ci/run-tests.sh _build waylandgles - .gitlab-ci/run-tests.sh _build broadway release-build: diff --git a/.gitlab-ci/run-tests.sh b/.gitlab-ci/run-tests.sh index fa29859b6f..e68cf5a6c9 100755 --- a/.gitlab-ci/run-tests.sh +++ b/.gitlab-ci/run-tests.sh @@ -44,6 +44,24 @@ case "${backend}" in kill ${compositor} ;; + waylandgles) + export XDG_RUNTIME_DIR="$(mktemp -p $(pwd) -d xdg-runtime-XXXXXX)" + + weston --backend=headless-backend.so --socket=wayland-6 --idle-time=0 & + compositor=$! + export WAYLAND_DISPLAY=wayland-6 + + meson test -C ${builddir} \ + --timeout-multiplier "${MESON_TEST_TIMEOUT_MULTIPLIER}" \ + --print-errorlogs \ + --setup=${backend} \ + --suite=gtk \ + --no-suite=gsk-compare-broadway + + exit_code=$? + kill ${compositor} + ;; + broadway) export XDG_RUNTIME_DIR="$(mktemp -p $(pwd) -d xdg-runtime-XXXXXX)" @@ -62,6 +80,12 @@ case "${backend}" in exit_code=0 kill ${server} ;; + + *) + echo "Failed to add ${backend} to .gitlab-ci/run-tests.sh" + exit 1 + ;; + esac cd ${builddir} diff --git a/testsuite/meson.build b/testsuite/meson.build index 0b75c90811..10fa16dfbc 100644 --- a/testsuite/meson.build +++ b/testsuite/meson.build @@ -30,6 +30,18 @@ if wayland_enabled 'TEST_OUTPUT_SUBDIR=wayland', ]) + if get_option('debug') + gdk_debug = 'GDK_DEBUG=gl-gles,default-settings' + else + gdk_debug = 'GDK_DEBUG=gl-gles' + endif + add_test_setup ('waylandgles', + env: common_env + [ + 'GDK_BACKEND=wayland', + 'TEST_OUTPUT_SUBDIR=waylandgles', + gdk_debug, + ]) + endif if os_win32 -- 2.30.2